Another script swagger fix
Current work checkpoint. See diff for details.
merge