Have impl be complete.
Merge remote-tracking branch 'upstream/topics/uuid'