Differentiate the error message.
Merge topic 'fix-mapped-config-genex' into next

39db722 Differentiate the error message.
Differentiate tests.
Merge topic 'compile-defs-debugging' into next

444afd9 Differentiate tests.