Sync with production code
Revert "Sync with production code"

This reverts commit 8ab18969ff45f0053dd733c9b2d367116e5180c3.
First commit