Merge branch 'tf/gitweb-ss-tweak'