Merge "Fix appData field type" into pi-dev