Merge pull request #1 from ykhadilkar-rei/master

Merging master with 1.17