Embedded document may be nullable
Merge branch 'develop'