Milestone 4.2.16.4

Bug fixes