[Only for master, not ee-6.2.x] LPS-50673 close field-wraper tag

cc/ @adolfopa