CISRO - closes #3170
Merge pull request #3171 from permcody/CISRO_fixes

CISRO - closes #3170
Merge commit '2b6d3624388e08c2b517778ba2d66d3c789c3dbf'