Merge "BP2 now handles old browser URI"