Second commit potentially supersedes !712: @hamano, can you retests in your environment to make sure it's covered?