Merge remote-tracking branch 'remotes/origin/xdccore-K-sasha2' into xdccore-K-dr