Milestone finished
Stile is merged