Backend synced security changes (#2541)

Backend synced security changes (#2541) #735