Merge "Adding empty locale-config case" into tm-dev