Fix JIRA     BLC-864