housekeeping for dev merge and wiki