Update common to 0.11 branch