Minor changes from merge to master, comment removal.