And implemented this for Cressi Leonardo, see the attached patches.