Fix jenkins issue with 1.6 [MJ-818]