Use generator toolset error message with predictable whitespace
Merge topic 'generator-toolset' into next

14252c0 Use generator toolset error message with predictable whitespace