[SR-Dev] git:master: Merge commit 'origin/andrei/fixups'