Features/99 xss prevention

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