[sr-dev] git:master: avpops: merge avpops modules