UPD: merge with master