Merge "Tame some monkeys"