Merge branch 'jc/clean-fix'