Merge to single repository (develop)

Merge from shinetechs/features/99-XSS-Prevention to new branch
"features/99-XSS-Prevention" (develop)