Update the master branch with the changes from the upstream repository

COOK-3900 branch has already been merged into master.