Own commit to cherry-pick instead of jeroenqui's 79c3eb7ece87c88666ffbe1816fd3c71895c4ee0 commit