WP-3112: include the float and modal changes.