Merging my dev branch with kbase dev