Merge branch 'release/v1.3.5' into develop
Fixes issue with enabling/disabling modules
Version bump to 1.3.6
Merge branch 'release/v1.3.6'