Merge branch 'dp/clean-fix'