Merge "add base type of enum to reduce class size." into devel/master