WIT-17946 to WIT-18364