Enable Content blocks to be available from with Macros

Our prospect (Gnosis) have asked for the single source of truth which is Content Blocks (within Guide) to be available in Macros because they have a number of links and content items that they want to use as solutions for customers. They understand the value of content blocks in Guide but they also have the same links and content in Macros but have to update them manuall and it's a big pain because they first have to search for the links within the Macros then manually edit them.

Thanks