Merge remote-tracking branch 'origin/imp/JAL-2775' into bug/JAL-2778again