Rel28

Backporting pull request from develop to release/2.8 for fixes/improvements to library browser 1.