Merge tag 'roller-5.2.0'