Resolved WF-1754 & WF-1756
Merge branch '7.5.x' of github.com:amydwivedi/security into 7.5.x