Hardening/style guide common (into develop)

"Twin" PR of #488 into develop