Merge branch 'instance-deletion' into 'develop'