Merge branch 'develop' into feat/194-unable-to-correctly-extract-the-aggregation-function-names-from-the-dictionary-received-as