Merge "Make the arguments of resource id consistent"