Merge "Don't process objects with empty name" into nyc-mr1-dev