Merge "ApplicationManager : Remove redundant code using inheritance" into devel