[packaging] based on upstream tag RELEASE-1.10.31