Merge branch 'refs/heads/t/rm_source_browser'