merge branch from tizen_3.0