Merge branch 'masking-inputs' into development