Fixed loading of nested objects when the root includes a base definition Fixed loading of nested objects when the root includes a base definition Merge branch 'master' into camera-rewrite Fixed error when loading legacy stages Merge branch 'master' into camera-rewrite More camera rewrite work