Charitha

Any update on this PR? We have implemented an override macro as a workaround but would be nice if this gets fixed in the adapter code base.