Worksheet remade
(cherry picked from commit 4aafb9b)
Compilation fixed
(cherry picked from commit f96e1e1)
Better performance for finding sources for navigation.
(cherry picked from commit 1a7ef03)