[sr-dev] RFC: updates to some core functions