[sr-dev] K|S usrloc merge