#6201 upgrade task, custom field title and redirect, some polish