Fixed mute to use flags as originally intended by the OAX team
Merge branch 'sookee' into katina-dev