Merge branch 'branch_v2plus_igor_3777' into master following branch_v2plus