Added new field into entity (part of it)
Merge remote-tracking branch 'origin/master'
another partial commit