Helper commit for issue #1205. See #1282 for additional details.