Still need to review this to understand if we still need to manually handle this in the newer libs.