Merge branch 'wip/searchable_uuids/dirk' into 'master'

Make hiccup more useful for CS

See merge request !4