Merge branch 'rj/tap-fix'