v6.1.2 :shipit:
Merge pull request #361 from clear-y/v6.1.2

[Don't merge] v6.1.2 - preemtive PR