Please merge these changes.

It fixes all the things.