(cherry picked from commit 7d4453198b) This is only a partial cherry-pick, since signing commits during a rebase is not supported in v0.27.
7d4453198b