LPS-40966 Prepare for dynamic axis