Merge branch 'force_pinned_objects_to_be_empty' into 'develop'