Merge "Fix a crash case" into jb-mr2-dev