Refs #8658 changed h to hbar
Merge branch 'feature/8658_h_to_hbar' into develop