See also request #676