merge to fix
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest-desktop/.lop_config/.LOP