* commit '3259d8853760a72b811757e1711119d041962a1c': DO NOT MERGE - backport of l92a02b31 from master