Draft: Resolve "Rider revamp issues" #1548

Open
korina.cordero wants to merge 1 commit from 623-rider-revamp-issues into master-fix

1 commit