Merging sw-refactor into proto back.