Merge "Replace enum by int"