[sr-dev] git:master: Proper parsing for PVs