Merge "fix(spm): silence warning in sp_mk_generator" into integration