Merge "Add usage flag to create ScriptField_*"