[Npos_2018] ! Draft PR for next week (German and English)