fixes for jira NCF-272