Merge "Revert "Merge commit 'b6548a9' into merge""