Merge remote-tracking branch 'origin/feature/2588' into feature/JAL-2527