And the clones are picked up by the config section...

(cherry picked from commit 4e95140f)
(cherry picked from commit d0419d15)