Merge "Fix wrong index value." into jb-mr2-dev