** Fixes for problems noticed while reviewing code
Merge branch 'develop' into FTR-122_STUUSR