More changes for Firenzina 2.4.2 (6th try)

These are not "real" changes, just trying to sync the branch