Merge branches 'backport/ltsi-3.4.25/lager-3' and 'backport/ltsi-3.4.25/pfc-7' into backport/ltsi-3.4.25/h2-base-8