Merge "Fix support version." into jb-mr2-dev