Merge commit '3b724c836b13b320b2b2c492c28660617e0d503e' * commit '3b724c836b13b320b2b2c492c28660617e0d503e': Improve thread safety of input mappers.
Merge commit '3b724c836b13b320b2b2c492c28660617e0d503e' * commit '3b724c836b13b320b2b2c492c28660617e0d503e': Improve thread safety of input mappers.