Improve doc export
merge