Merge "fix possible build break" into jb-mr1-dev