Sure, Chester, feel free to backport to stable branch and send a PR :) The master branch will be switched to 6.6-rc1 soon later (likely in today), so you can leave it.