Manually merge branch 'branch_v2plus_igor_3101' into master