Fix for break due to sdk change
Merge pull request #617 from christav/release-0.6.17

Fix for break due to sdk change