Merge xerkus dev branch