Merge via KDIFF3 with 71f987430236b5650ff1149bc8632e1f2241cf96

Merge with Rythal/Carbonite Latest Commits
71f987430236b5650ff1149bc8632e1f2241cf96