This fixes #7942.  It now more dynamically assigns the axes.
Changed the version to alpha17