Fixes issues in 5.0….

Read the release notes  here https://trl.trimble.com/docushare/dsweb/Get/Document-592510/