Merge branch 'f-container-delete-reference-dependency' into 'dev'

Container could fail to delete when there were reference properties

See merge request !121