#3167 Correction of the typing mistakes in Mediator
Merge issue #3167
#3006 Correction of the typing mistakes in Mediator