Synced with production refs #2289