[8.0] Forward port of #14