Refs #9213. Attempt to fix build errors/warnings
Merge branch 'feature/9213_initial_alc_interface' into develop