12.5 to v13 Upgrade planning - Form Type Issue