[OrderedResolvedFormType] Fix builder creation
Update CHANGELOG