Merge "Correct type of appData field" into pi-dev