CDB-4021

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