JAL-2089 patch broken merge to master for Release 2.10.0b1