Rebase code with tizen 2.3 with following additional changes