Revert "Revert "Framework: Shake to Temporarily Secure && Fixes(1/2)""

This reverts commit 26982b7d89b5902085ab80a1037e3c0caf0c0ac2.