Merge branch 'svost-C4702'