o Update doc
o move rarely used feature out of main make-build