Part of WP-1575 Added one more form alter.