Merge upstream changes for PART-3886

Merging upstream changes.