Merge "Fixed CTS failure"