Finished merging OCCA2Night -> OCCA