Bug 19 from original gitlab repository.