CDB-4006

https://cartodb.atlassian.net/browse/CDB-4006