fix some crash
Merge remote-tracking branch 'origin/lopv2'

Conflicts:
	DiamondTest-desktop/.lop_config/.LOP