Merged from changes introduced on revno 8681