Merge "Skeleton Decorator API" into new_text