Merge "fix(st): fix NULL pointer dereference issues" into integration