3.2 development version
Merge pull request #1405 from Mirantis/ver-3-2

3.2 development version