Merge "Fix issues in TunerClient implementations" into sc-dev