Merge "fix: 'sp_mk_generator.py' reference to undef var" into integration