Remove 'Dazed and Confused' errors when the module is commercial
Merge branch 'develop' into release/12.0
Bump version