Merge branch 'jc/denoise-rm-to-resolve'