Merge "Added devel-api mirroring of public enumeration." into devel/master