Merge "Fix mos test triggers"