PIM-3326-stable : Fix mistakes in config