JAL-2759 reinstate change from develop (JAL-2636) somehow not merged