[Bug 226165] Merge Review: mt-st