Followup on review Valhal-27
Followup on review Valhal-26