Merge "Fix issue with sort_api.sh"