Fix issue with missing fields for `ps` template Upstream-commit: 8930aa0a8615b02905c5f33c00ddef383bdc2193 Component: engine