Merge "ApiOptions: set form field parent earlier"