OC-6110
checking parsing code for payload change
Merge pull request #91 from jkeremian/OC-6110

OC-6110