Merge branch 'remove-configuration-cleaning-216' into next