Feature/74511060 money claim single and multiple locations

I think we should try to avoid introducing whitespace changes