Merge "Add an explicitly v3 manifest fragment" into main