Merging updates for hotfix