F1481090

F1481090: feature_requests.diviner