F1666409

F1666409: feature_requests.diviner