Thanks for the patch! However, this is already being worked on (in a slightly different manner) in HHH-8118.