Merged in branch "merge-kitdll-kitsh-common" to trunk