Submitted as D5260 which was merged to master and adjusted for changes (essentially becoming this patch)