Merge "Disabled in container environment" into tizen