alf changes from master