Merge "Fix cyclic mute" into lmp-dev