Add surface layer setting for better collision stability
Merge branch 'feature/odefixes' into openhubo