Prepare for merging with Anizoptera CMF subtree