Merge "Refactor axis initialization logic"