[fix] mantis #5862,5864, 5861 ((problem 1)

Change-Id: I6ae79e6041765d1e1795ed70c61e40e714e4f259
Merge "[fix] mantis #5862,5864, 5861 ((problem 1)" into unstable