Dc/Melanie |#3390 | BugFix - Edit datasender and fixing st