Merged changes up to version 2.3.4 into unstable.