Merge "Add createAxis to reduce the size of a function"