preface.xml tune-up
Merge branch 'stable'