[FIX] small potential encoding issue in custom models
Merge remote-tracking branch 'upstream/8.0' into 8.0