Merge branch 'topic/customhdr'