Merge "Add SpecialBlockModifyFormFields hook"