merge developer to master

Change-Id: Ibb6f37f069cf93a7760c9622d0d47853a8cc3867