Thanks Carl Meyer and Tim Graham for the reviews and to all involved in the discussion. Backport of 18c0aaa9123579375294fcc4a8ee7e3530176b88 from master
Thanks Carl Meyer and Tim Graham for the reviews and to all involved in the discussion. Backport of 18c0aaa9123579375294fcc4a8ee7e3530176b88 from master