Merge "Fix default value type : should be long instead of int .."