merge (cherrypick last check-in)