JAL-1641 cherry-picked changes into develop compatible branch