Avoid Null Ref in GetSalvagingBookmark
Merge branch 'BleedingEdge' into experimental