Merge branch 'JAL-1315_headlessEPS' into develop