Merge "Fix json parsing of resource input" into casablanca