Merge pull request #1023 from rustyswayne/Refactor/M-502

Merge 1.6.1