see commit message(s) and https://bugzilla.redhat.com/show_bug.cgi?id=2156684
NetworkManager-ci!1440 (merged)