- Merge in latest updates from master branch to resolve merge conflict.