Changes for ITS common and jira