Fixed EA-63488
Buildserver auto merge