PR raised https://github.com/commerceguys/commerce/pull/269. Done for today.....