Merge branch 'nd/remote-update-doc'