CDB-4028

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