Merge from RC
mb: 11235 - custom fields
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.