More trial and error...
Merge branch 'resource_format_fix' into noaa_dev_resource_format_test