Merge tag 'tags/3.2.0' into develop

version 3.2.0