WIT-96617 to WIT-96637