Noted #648, #737, #733, JENKINS-13546