Merge branch 'masking-inputs' into development

Now we have forms input **formatting**! :smile: