Merge branch '286-fix_regressions' into 'master'