Merge branch 'support_skipped_fields' into 'ibm-trunk'

Support skipped fields

See merge request !57