Merge "Fix wrong number of columns for AllApps calculation" into main