Merge pull request #397 from senivam/master_2.1.2

technical merge for release branch 2.1.2