Merge branch 'feature/JAL-1333' into features/JAL-1333