Propagate MR!110 from master to v32r0-patches
Update test references to follow MR !108 (merged)
(cherry picked from commit 655d3108)
8e801c5d Update test references to follow MR 108
Edited by Marco Cattaneo
Update test references to follow MR !108 (merged)
(cherry picked from commit 655d3108)
8e801c5d Update test references to follow MR 108