Merge "Fix bug in grain." into jb-mr1-dev