Changes ro features reapplied from local copy