Merge "Fix BlockList params for non-editing partial blocks"