fix for failing junit tests.
Merge branch '4.3'