Merge "Fixed jira issues:N_SE-46521" into tizen_2.2