Merge branch 'JAL-1315_headlessEPS' into Release_2_8_Branch