Revert "Revert "DATA-1501""

This reverts commit a959fa8113fd78536fb96c51b263ff48444a9c89.