feedbackform temporary fix
from
Merge branch 'develop' into testing