[HK] Formatting
Merge branch 'master' into inex-live