Merge "Configurable data error action in value metric" into pi-dev