Allow for checking whether there is any old input by making parameter optional.
Merge branch '4.0'