Remove unneeded stipping function, should fix #7672
Merge branch 'dev' into test