Osng 471

This pull request contains all changes for userstory #OSNG-471.
shouldn't this be in one line since it is just one parameter?