Fixed BUGS 2296, 2297, 2333, 2289, 2286, 2287, 2285

Signed-off-by: wangjun <junx.j.wang@intel.com>