Merge branch '309037-non-regression-test'