Embedded entities which contain a empty collection of values that aren't entities are now considered empty, if this collection is empty. Closes #1737 Original pull request: #1812