Ref #36652: fix upload after spring update