Merge pull request #4644 from geoffreysisco/fix/rename-bookmark-rotation-crash