Noting #1314, #1316, #1308, JENKINS-17667, JENKINS-22395, JENKINS-18065