New changes for updates
Finished update operation
Merge branch 'update-feature' into develop