Merge branch 'fix-up-dev-flags-when-add-p2p-down-link'