Updated code pertaining to Jira Task Core-433