Increased number of tracked features to increase robustness
Merge branch 'dev'