WSOTWO-118: Improved re-draw operation for Branch widget
WSOTWO-117: Improved re-draw operation for Shape widget