Merge pull request #1625 from clpetersonucf/dev-10.3.0-final-fixes

Merge pull request #1625 from clpetersonucf/dev-10.3.0-final-fixes #1107