Merge "Increase converter polling interval." into jb-mr1-dev