Issue #8332 by cableman: Fixed contact forms
Merge branch 'development' into feature-price-button