WP-2482 Changes related to validation and states