re-applied lost changes during last merge