Merge "Add explicit close of Scanner input"