WIT-96807 to WIT-96808