Merge branch 'static-fe-object-id' into 'develop'