Merge from lammps-icms