initial commit from 2.5.3 dev