[sr-dev] RLS bug fixes