SSM 3.9.1 - Fixes, improvements and cleans.