merge mark version-1

Signed-off-by: Li,Limin <liminx.li@intel.com>