Merge "Fix test failing with NPE due to null List" into main