FIX
Turn make variables into strings early in the processing to avoid any issues if they come from Python or YAML as other types.
Merged by: douglas-raillard-arm at 2022-06-21 13:55:07 UTC