REGEN: doc
MERGE: dev to master