Merge conflict merging dev into feature/424-remove-picklist-sorted

mrbelvedere tried to merge new commits to dev but hit a merge conflict.  Please resolve manually