FQA-1021 fix bugs of SOC