Removing the tracking on application manager
Merge branch 'dev' into feature/qt5