Revert "Revert "V3_0""

This reverts commit 855106ac0079df583c630ea7ccecd785af0c9596.