Add indexes to tables;
Merge branch '2-2-nemo-stable'