Fix regression
Merge branch 'master' into ST3