automerge: 07faf0e * commit '07faf0e1a1d32408dfdc863a0996baa8522c5fdb': Add missing passive discovery flag