[Sandbox-commits] r516 - masc