Merge branch 'fix-eliminate-empty-list-bug' into 'master'

Fix a bug when using eliminate_empty_output_lists and omit_lists together

See merge request !34