Merge branch 'master' into 367732-JettyUpgrade8.1.1