TA17475 MetangaAggregateException refactoring
Fixing CA1006 warning
Reviewer: DMartynov