changes from HEAD, manually transfered