Merge "Added @since to type-registry.h API change" into devel/master