Nerdler 7 merge with development