DB/Misc: More WDB updates from 15050