[Merge] Usability branch. Improvements in tools modules