XXX With and without 17. 28000995

XXX With and without 17.

XXX With and without 17.

added: