[JENKINS-21773] Noting merge of #1149