Merge branch 'sh/am-keep-cr'