Merged latest changes from telscale ts720_rvd_master branch commit c067ab5e7345044d7e9b6713