Merge remote branch 'remotes/origin/bug_587_new_internally_connectable_and_unsupporte...