Merge "[core.room] allow annotations at ports and messages"