Catch up with Vanilla changes