JAL-2136 merged develop into branch to fix build failure