Do not attempt to set parameters unless they are explicitly defined in the incoming data.
Merge branch 'fix_annotation_handling' into inthe_am