[WiP] - draft for JENKINS-25771