Merge "Check outInfo is not null" into jb-mr2-dev