Handle NoConfig case.
Merge topic 'fix-mapped-config-genex' into next

4b7dcfb Handle NoConfig case.