Merge "Prevent infinite appending default in retail mode" into main