Merge change 54

* changes:
  Revert "Enable OpenCORE on master - part 1"