[sr-dev] git:5.8:b1a30880: Revert ac4f1be039 - split into per module commits