Merge branch 'release/r3' into develop
ConsumeTestProduct now check return code and uses proper token.
New release
Merge branch 'release/r4'