I tried to merge modifications from the master.