cherry pick bugfix.
merge. add new mvc conzept.
continue with mvc conzept.