Merge the prototype into the master as it's working for textBlocks now properly