Tooltip: Quick backport of container fix