ported SOURCE management from 2.0.5