Merge kore-changes from voxel-branch
included new files