Fix missing import in 3038
Remove unused code (sampling workflow handler)
Release 3.1
Merge remote-tracking branch 'origin/master' into develop