Remove conflict marker
Merge branch 'oc7launch2'
Revert "Merge branch 'oc7launch2'"

This reverts commit 8db517899d127c9c6f339476f882dc0f1fee7ad4, reversing
changes made to d7be7e194b9bda9ece460659749d56756a807f90.
Revert "Revert "Merge branch 'oc7launch2'""

This reverts commit 0589bff8a3710f403257f9ac4eae925933407fc1.