Merge branch 'feature/object-pruning' into 'develop'