track latest system 3.2/develop
Merge pull request #1 from enov/3.2/develop

track latest system 3.2/develop