Merge branch 'hotfix/4408'

Close #4408
Changes to InputFilter to better implement continueIfEmpty() functionality.
Merge branch 'hotfix/4426' into develop

Forward port #4426