Resolve "Rider optimization improvements" #1430

Open
korina.cordero wants to merge 7 commits from 534-rider-optimization-improvements into master

7 commits