Hand-apply 111f02f4fc8ace359a16aea1c88c2821bf3dde31 from master; improve progress...