Issue #3396197 by alexpott, BramDriesen, borisson_: Config saved during import...
Issue #3396197 by alexpott, BramDriesen, borisson_: Config saved during import does not have correct initial values set
(cherry picked from commit b07fdfae)
(cherry picked from commit d5d7549f)