Merge change 7043

* changes:
  fix [1964315] crash in the surface.cpp while browsing