PMM: Update to add Plus checks
SGF: Changes and additions to replacements
Merge remote-tracking branch 'origin/develop' into Steven-Unpublished
Merge remote-tracking branch 'origin/develop' into Steven-Unpublished
Merge remote-tracking branch 'origin/Steven-Unpublished' into develop