Updates from Pantheon commits.