Ported JIRA 304 to STG.
Ported JIRA 304 to STG. Part 2/2.