Merge "fix(st): add missing header include" into integration