This was originally done as part of #1583 but that was closed, so just opening a general issue to keep track of this.

@mhvk @taldcroft - is this currently in any of the pull requests?