Merge commit: Cherry picked from 09707c1