Work dir fix
Merge branch '4.3'