optimizations for single valued fields
make all links multi-valued even if isCollection=false, due to referential integrity
Merge remote-tracking branch 'origin/master'