Bug 9 from original gitlab repository.