From local
Merge remote-tracking branch 'zezda/master'
fixed public data