Workaround for spiro failure
Merge branch 'smooth' into devel

Workaround for spiro failure