Merge "Change Chip between QS and QQS"