Include M82/M83 for Teacup too. #1206