fix conf callback (align with v3/master), RT#25239 weirdness?