Merge branch 'release-1.3.5' into develop
SNAPSHOT version
fixed a compiler problem
add hardware class support for storage volumes
add some fixes
Bumped version number to 1.3.6
Merge branch 'release-1.3.6'