Merge "Change size for resource input" into casablanca