Update to last containers changes.
Improve .merlin files.