Manual merge bullseye
MR based on !1 (closed) but using wip instead of proposed-updates to avoid the license scan issue since this package is for development
MR based on !1 (closed) but using wip instead of proposed-updates to avoid the license scan issue since this package is for development