Better tool:imgdb
Glue things properly
Add tool:imgdb:gen --merge
Update vendor, add rc-diagnostic