ajusteForm
Merge remote-tracking branch 'origin/textMerging' into textMerging