Update for user branch merge with master
Fix for users merge to master