LUN-1022 : Add flexible header form logic