Merge branch 'feature/JAL-2664' into feature/JAL-2527