Merge branch 'jihee' into 'master'

CellID fix for simulation

See merge request !2
2 jobs for master