Manual merge

Thanks Peppy