Merge branch 'gb/shell-ext'