Implements #1611 in OST#1625

micafer wants to merge 4 commits intomastergrycap/im:masterfrom

open_portsgrycap/im:open_portsCopy head branch name to clipboard