#3580
#3580 with a minor ui fix on the remote pub page
#3528 final final commit