[sr-dev] git:master: Merge branch 'master' into pd