Referencing this discussion with @ABW opening a separate task for this
#453 (comment 198098)
(screenshot of comment below for ease of access)
