Merge branch 'develop' into tizen_qemu_1.5.1