WP-2040 Updating with a new export of this feature