Additional JSON annotations to identify reference implementations of the
different interfaces.
Merge commit 'f1f985af15ec6c95c3ac7c4c923eb18dcc194848'

Update in subproject.