Merge remote-tracking branch 'origin/core' into wp
Adjusted wp to changes of core