Fix missing property
Merge branch 'develop'