Merge "Add missing spaces in constructing args"