First-try migration to 1.31.1: without PortalInfoDialog modification (it has been refactored too hard)
Merge branch 'master' into 1.31.1
Fixed 'Scanner zoom in' feature for 1.31.1
Fixed PortalInfoDialog content (keys count etc)