Moving changes under proper version (refs #19051)