Adopt to DITA 1.8 M2