workaround for shard error added
Merge remote-tracking branch 'upstream/devel'
handle shards in aggregation_context the same as in file_context