Fix missing import in 3038
Remove unused code (sampling workflow handler)
for release
Merge branch 'release/3.1' into develop