Milestone 4.2.16.1

Bug fixes