This is a follow up to #702 by @jpopelka and a reminder to review and revisit this
This is a follow up to #702 by @jpopelka and a reminder to review and revisit this