BISERVER-10435: Serialization changes and annotation changes