merge latest hub into majhub fork