WP-2351 Removed dependency on working_paper