chore: improve --embedded-database
messaging
#1407
Merged
--embedded-database
messaging
#1407