PLA-1059 bug fixed
Merge remote-tracking branch 'origin/sony-new-api-v3' into sony-new-api-v3