Merge "App chip refactor" into main