FIXED Jenkins Build Failure both on Master and branch 1.5.x