Fixes #100 Apply @EmptyCollectionIfNull to lazy loaded collections/map too
Merge branch 'WIP'