Merge from release to master on TLT-499

QA approved/tested.