Axis merge recode

see changelog for comments.