Issue #1820 - Improve the Blob implementation