Refs #7832 fix mac build second try'
Merge branch 'feature/7832_SaveLauenorm' into develop