Merge "Fix typos around inverting axes" into jb-mr2-dev