Bbox fix rebase

This is a rebase of #3434 to remove an extra svg file from the history.