Merge "Fix check for default source in input command" into klp-dev