Apply several fixes from 5.0 branch - see commits in submodules for details.