merge changed things from tizen_2.1