Fix regression and tests
Merge branch 'unity-4.3'