Milestone 4.2.16.3

Bug fixes