[sr-dev] git:master:272a4e08: Revert 8b2573c1f7 - split into per module commits