add propeties
Merge remote-tracking branch 'origin/M1'