Cutting v2.5.2-RR
Merge tag 'tags/v2.5.2-RR' into server