Merge "further clean up of errorperbit and sadperbit"