Cherrypick 0bfc8