Rc2 dev

Modifications for the synchronization of Browse/Analyze.
There are some modifications duplicated because of a merge. There are also a lot of removed code, which was commented code from RC1.