TIMOB-12651 Addressing issues that slipped past first pull requests.
Merge pull request #4034 from BlainHamon/timob-12651

TIMOB-12651 Addressing issues that slipped past first pull requests.