Mapping of configurations (version 2.1.1)
(cherry picked from commit ff25d2f)