PLEASE backport this patch into the 1.12 branch of TFM