IQSMLPSDK-39: Added code review comments.