nitfix & restructure compatibility toc
Merge branch 'v5-stable' into v7-stable
restructure compatibilit toc