Refs #9413 add more corrections
Merge branch 'feature/9413_AnvredCorrections_TOPAZ_additions' into develop