Merge branch 'feature/JAL-2613' into feature/JAL-2611