Merge branch 'th/remote-usage'