Update for Jira tickets

TM-7319 and TM-7322