Merge "Copy oparent sonar setup"