Updates to sync with the master branch's latest changes.