Merge masterstaging into master

This is the version after commit "disable redirect" 5e62dc85f2eccf4a9972ecf5ed0c586c55f8fb7a.