erge Milestone 6

merge final FE fixed into develop