Merge branch 'hotfix/testing_Hotfix' into develop
new feature file added
Merge branch 'develop'