merging chunk-11 claim-mgt modification into git