Merge "Remove version-script option"