Fixed #1481. More Mediator schema fixes.
Fixed #1494.
Merge branch 'master' into production