Issue #1378110 by attiks: Conflict with Clientside Validation module (and fixes for #1842700 and #1847578)