Merged some other changes manually