Merge tag 'v5.2' into next

Sync up with mainline to resolve conflicts in iforce driver.