#758/2: small fixes to merge ezsv2
Merge branch 'upd-master' of github.com:/guyromm/AutoMerge into upd-master