1. Code synchronization with tizen_2.4