improvement in working with embedded objects (experimental)
Merge remote-tracking branch 'origin/master'