Merge "occam: fix build"