propagate further changes from vanilla repo files