Merge commit 'e33d1ed' into wip/v2.2.0-M16px