Update for Jira tickets

TM-7332 and TM-7319