Merge modified rajkosto edition