update forms
(cherry picked from commit 5593ab3)