Manual merge with master.
libraryView.Visibility settting is rewritten