work around with the menu, merge from latest source
mainly for buffer overflow and separate sensitive information patterns
Merge branch 'Feature_final_merge' into develop
- For the second time merge changes from internal repository