CLSN-872settlement request TODO -all issue fix