please-please-please-please, backport bugfixes to 4.9 branch! sure we can cherry-pick them, but it will be great to have them "officially" backported.