Merge updates from release 1.6

Merge updates from simtools release 1.6