Merge "Perform input validation for file $page at some strategic locations"