[DO NOT MERGE] Form row helper v2