Pulling PR from master to be applied to EAP62 branch