Merge branch 'fix/preview-not-working-with-form-data' into 'develop'