Fix feature/stabilization, remove duplicate deps
Merge to feature/stabilization, fix Junitest
Merge remote-tracking branch 'remotes/origin/feature/stabilization'