Security fixes from code review (F1-F4)#2

ChickenRunVN merged 2 commits into

masterChickenRunVN/quickchart:masterfrom

integrate/pr-mergeChickenRunVN/quickchart:integrate/pr-mergeCopy head branch name to clipboard