Properly fix CIDs 11364, 11365, 11353
Merge remote-tracking branch 'origin/0.98' into 0.98