Backend synced security changes (#2540)

Backend synced security changes (#2540) #734