Merge "Fix missing viewer config dump" into main