Merge branch 'jc/replacing'