Merge "Jira Id - ODUHIGH-473 Tdd mode related fixes"