Merged in murano-common messaging part