Merge develop changes
Strip trailing colons from extent values and fix 7** mapping of
contributor and creator