Merge "help image updates" into jb-dev