Milestone 6

Merge milestone 6 into develop