Sync with JIRA.Teamboard code