Merge branch 'VedomBranch' into Release-1.0.4.441
commit 511