Merge pull request #4139 from nutty898/master_nutty_adjustframework

Master nutty adjustframework
Merge branch 'master' into master_nutty_adjustframework