Sync usage fixes
Merge pull request #1559 from pravisankar/dev/ravi/usage-fixes

Merged by openshift-bot