Milestone 4.2.16.2

Bug fixes