Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev