Merge "Allow enable DBG/VDBG without having to rebuild the module." into main