[sr-dev] git:master: Merge commit 'origin/tmp/build_local'