Prepare feature branch for WP-2069