Merge "fix(arm): string split into two lines causing error" into integration