Merge branch 'patch/JAL-4345_pae_epas1_doubleclick' into develop