Adding custom changes to allow updates from main repo.