sticky to being a debug-bundle backport for 2.3+