Merge branch 'af/maint-install-no-handlink' into maint