[sr-dev] git:master: Merge commit 'origin/andrei/path'