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

CISRO - closes #3170