[Bug 1141308] New: please backport the following fix to release