Merge from nanograv version