Merge branch 'th/remote-usage' into maint