some fixes
Merge remote-tracking branch 'origin/dev_ilia'