WP-3013-1 Resolving a few issues that came after the last integration