Merge branch 'rj/header-cleanup'