Refs #8176 Fix for broken system tests
Merge branch 'feature/8176_indirect_trans_alg' into develop