ondemand: backport from CAF 3.4 kernel