The changes look okay to me at a first glance, you could please move the bug to ON_QA. I will verify it.
Changes look good to me.