Feature/complex field values

### Description
Time to merge feature/complex_values into 'develop' ...