Merge changes Ib324dffb,Id4e05e6e into tizen