Merge branch 'fix-object_age_policy' into 'develop'