Dev#21332 onedtouch harvest

efalcy requested to merge dev#21332_onedtouch_harvest into WIP

Merge request reports