Merge jenkins-working-branch after 2.8.1 release

Following release guide steps to merge jenkins-working-branch back to master