merge new form 477 stuff, #24047
minor bugfixes, #24047