Merge branch 'anagno-misc' into hotfix-1.2.5