Merge remote-tracking branch 'refs/remotes/Conjuro/Bugfix-show_name-None' into Conglomeration