Osng 471

This pull request contains all changes for userstory #OSNG-471.
method to long, please split into 2 methods