Revert "Revert "v1-0""

This reverts commit 7f6733a5efa1f77b497d2a40d5d0401faa05b3ec.