Merge "[Feature][T8TSK-181][SIM]sim-demo optimized" into MR3.0-merge