Merge "Runtime spec file and generation"