CISRO - closes #3170