Merge "Fix sections for align udfps." into main