Fix 3291

need to be tested with a branch with the same name under Widget repo