Adopt to DITA OT 1.8 M2