Feature/74511060 money claim single and multiple locations

This commit isn't related to this scenario