Oer spec merging to master