merge jenkins changes from v2.0