re-add PPE changes (this should be released exactly on may 15)
Previously this was reviewed in !43 (merged), !59 (merged) and !63 (merged). Then I found that it should not be online yet so reverted as hotfixes in master. This MR should then get merged and released exactly on May 15th.