Feature c/axis fix+doc

marc duez requested to merge feature-c/axis_fix+doc into dev Jun 25, 2021