bug fixes (final patch hopefully)
Merge remote-tracking branch 'origin/Doris'