Synced with latest bidi/xepersian