Fix CIDs 11389, 11390, 11391
Merge remote-tracking branch 'origin/0.98' into 0.98