Going to hold off on this one until the other v4.6.1 PRs are sorted first and we are about to release 4.6.1.