Merge "fix(psa): fix static check failure" into integration