Merge Ray into Master