adding automation around bug 5221