Merge "Hide v1 conn. display illust. and Use toggles" into main