Merge pull request #1 from ykhadilkar-rei/master

Merging master with 1.17
Merge pull request #2 from ykhadilkar-rei/Release-1.17

Merge pull request #1 from ykhadilkar-rei/master