[sr-dev] git:master:9cc01c03: Merge pull request #1622 from lz1irq/master