MDL-34476 - Blocks - Fixing context issue