Track issue 16679