Fixed bug with empty on FlattenOnDemandVector
Merged 1.2.16