Merge "Fix get resource input json string issue"