[Bug 1141308] please backport the following fix to release