PR: 136798, 136924 Submitted by: Aurélien Ansel <aurelien.ansel@netasq.com> Approved by: VANHULLEBUS Yvan <vanhu@netasq.com> (maintainer via private email)