=Some unmerged changes from long time ago