Sync with wdb changes to middleware