[sr-dev] Partial Cherry Commit