For tracking, this comment will be addressed when the changes from pull request 1912 are merged.