Merge experimental into 0.3.x-cmake