Merge "Fix all apps key" into main