simple modifier cleanup
Merge origin/master