Bug 26 from original gitlab repository.