all: merge branch 'th/invalid-connections-bgo760907'