Merge "Put DWBC calls on handler" into main