Merge commit 'ebc0457' into cmake-options

REVIEW: 112766