They see me mergin

They hatin

Merging latest bay master. Gotta have dem fixes.