UAR-677 (Corrected Branch)

This is the pull request for a corrected feature branch for UAR-677. The original feature branch was created from the development branch as opposed to the master branch. To correct this, I deleted the UAR-677 branch on my local machine and re-implemented the code fixes and did a git push -f to force the push and updated commit history in this branch.