Add files from master to the help-reorder branch