Merge branch 'some-CR-fixes'