Merge "Fix constant type"