Mike/fix address claim func

Mike Hoang requested to merge mike/fix_address_claim_func into master

Merge request reports