JAL-3490 merged with 2.11.2 develop