binder:Backport from CAF 3.4.0