Bug 16 from original gitlab repository.