Issue #3121897 by mark_fullmer, arafalov: Disambiguate provider of blocks (e.g., System blocks vs. Menu blocks)
Closes #3121897