Merge branch 'dynamic-reference-properties'