Merge "Remove support v1"