Merge branch 'jk/remote-default-show'