Merge "Fix imf flag" into jb-mr1-dev