Finilizing merge #607