[JENKINS-22967] Polish new api