Pr 877

Manual merge...