merge new form 477 stuff, #24047