[fixed] Matis Bug #3220 

Change-Id: Ie2de42cadfbd0aaf766fcb2c65a6d7174906190a
Merge "[fixed] Matis Bug #3220 " into unstable