@dahlbyk If that's ok with you, I'd prefer merging this PR as soon as possible and tackle this in a separate thread.

Could you please log an issue about this (or even spike the change)?