CR fixes for commit #796fbff