cleaner returns and preventDefault refs #17382