I have attached a patch that I am using to solve this problem. Not the best patch, some cleanup work is needed, but nonetheless it works. My apolozigies if anything is wrong with the patch since I am still trying to improve my life with SVK slowly, but surely ;)