Merge "Fix build - current.txt regenerated" into jb-mr1-dev