Ticket #1066027: adjusted all changes to show the adviser role in use of the keywords done in the parallel ticket. In addition all
functionalities were checked due to the branch changes and merges and looks stable so far.