Implement CALL-3288; resolves #8