Clean, but not too clean
Merge branch '4.3'