Fixes for bugs 194237 nd 194238
7 files changed