Merge branch 'dev-fix_aggregation_execute' into 'master'

Aggregation(): Return original data and warning if 'Time_aggregation:execute' is set to 'no'

See merge request !170