Merge topic 'fix-MAP_IMPORTED_CONFIG-evaluation'

15d98a4 Genex: Fix evaluation of MAP_IMPORTED_CONFIG_<CONFIG>
Merge branch 'master' into next