Merge dev-25-specta