merged into master-2.5 ee jar #2893