Merge branch 'sandbox/knimitz/format_code' into sandbox/knimitz/lock