Merge branch 'hotfix/deleteAndUpdateBug' into develop
Merge branch 'develop'

* develop: