Merged Child SOC 1 with master