some fixes
Merge remote-tracking branch 'remotes/origin/master' into dev_ilia
...|