Reports unification
Excel generation changes
Merge with conflicts resolving