am a499a2ad: Merge "Fix aggregation exception problem"

* commit 'a499a2adb856223de65d298cd93d70c85afe3d4d':
  Fix aggregation exception problem