save/restore bug on bridge_view fixed
merging