[sr-dev] git:master: Update to current module set for 4.0