Merge "Fix wrongly applied supportedAxes" into main