Upd: merge branch master into v.3-1